From ffb1b3ab9b33037e89abdffd464462a964d4b64f Mon Sep 17 00:00:00 2001
From: Bastien Guerry <bzg@gnu.org>
Date: Mon, 13 Oct 2014 18:44:30 +0200
Subject: [PATCH] Fix org/ChangeLog wrt latest Org Sync.

---
 lisp/org/ChangeLog | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index aeaf1b3f9b5..4f44437b210 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,18 @@
+2014-10-12  Marco Wahl  <marcowahlsoft@gmail.com>
+
+        * org-agenda.el (org-get-entries-from-diary): Use
+	`diary-fancy-display' instead of the obsolete
+	`diary-display-hook'.
+
+2014-10-12  Nicolas Goaziou  <mail@nicolasgoaziou.fr>
+
+        * ox.el (org-export-async-start): Limit first argument to lambda
+	expressions.
+
+        * ox-publish.el (org-publish, org-publish-all)
+	(org-publish-current-file): Replace `ignore', per limit stated
+	above.
+
 2014-10-12  Christopher Schmidt  <ch@ristopher.com>
 
 	* org.el (orgstruct-make-binding): Do not use loop in interpreted
-- 
2.30.2